Merge version 1:11.1.0-4+rpi1 and 1:11.1.0-6 to produce 1:11.1.0-6+rpi1

diff --cc debian/changelog
index 3eaeb5e35ba4ff04aa1eacae2e53c1f6a7af6580,e829716610019d9ee6a5e7f80e37979f5efda1e0..ba91ff045508e0c18877725c4581ceb7dc986d1e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,16 +1,54 @@@
- llvm-toolchain-11 (1:11.1.0-4+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-11 (1:11.1.0-6+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 30 Sep 2021 22:30:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Feb 2022 18:47:29 +0000
++
+ llvm-toolchain-11 (1:11.1.0-6) UNRELEASED; urgency=medium
+ 
+   * Do not fail on llvm-mt
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 27 Jan 2022 22:21:16 +0100
+ 
+ llvm-toolchain-11 (1:11.1.0-5) unstable; urgency=medium
+ 
+   * relax the llvm-11-linker-tools dep for apt.llvm.org
+   * Fix some lintian warnings
+   * Remove the build conflict on ocaml (Closes: #1002607)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 11 Oct 2021 20:36:19 +0200
  
  llvm-toolchain-11 (1:11.1.0-4) unstable; urgency=medium
  

diff --cc debian/control
index 3f9ce739298f4944c556a4de7aca53cbb202fbcd,fe6f47af845e183270e85a0c7a9f682377e2cabe..da2764e6f0661a3fb519eede176619ae91f4d5f0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -20,7 -20,7 +20,7 @@@ Build-Depends: debhelper (>= 9.0), cmak
      libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
      dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev
- Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
 -Build-Conflicts: oprofile
++Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
  Standards-Version: 4.2.1
  Homepage: https://www.llvm.org/
  Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 11

diff --cc debian/rules
Simple merge